Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for rollback config in compose 3.7 #409

Merged
merged 2 commits into from
May 29, 2018
Merged

Support for rollback config in compose 3.7 #409

merged 2 commits into from
May 29, 2018

Conversation

alshabib
Copy link

@alshabib alshabib commented Aug 1, 2017 •
edited by thaJeztah
Loading

Fixes moby/moby#32585

- What I did

Built off #360 to provide support for rollback config in compose 3.4. ie.

  deploy:
      replicas: 1
      rollback_config:
        parallelism: 1

- How I did it

Added the key to the schema, regenerated the schema and tied it to existing UpdateConfig type.

- How to verify it

docker stack deploy -c docker-compose.yml yay

with the following stack:

version: '3.7'

services:
  busy:
    image: busybox
    deploy:
      replicas: 1
      rollback_config:
        parallelism: 1
    ports:
      - 80:80

- Description for the changelog
This pull request adds support for rollback configurations to be specified in the YAML stack file. Given that it is build off the aforementioned pull request, it supports also rollback_config.order.

- A picture of a cute animal (not mandatory but encouraged)

dog

@alshabib alshabib mentioned this pull request Aug 1, 2017
Closed
@codecov-io
Copy link

codecov-io commented Aug 1, 2017 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@824a0b4). Click here to learn what that means.
The diff coverage is 0%.

@@            Coverage Diff            @@
##             master     #409   +/-   ##
=========================================
  Coverage          ?   50.52%           
=========================================
  Files             ?      216           
  Lines             ?    17724           
  Branches          ?        0           
=========================================
  Hits              ?     8955           
  Misses            ?     8321           
  Partials          ?      448

dnephin
dnephin approved these changes Aug 2, 2017
View reviewed changes
Copy link
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@alshabib
Copy link
Author

anything blocking this?

vdemeester
vdemeester approved these changes Aug 21, 2017
View reviewed changes
Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐮

@vdemeester
Copy link
Collaborator

@vieux @dnephin has 17.08 freeze started or shouldn't this be for compose 3.5 ?

@sirlatrom
Copy link
Contributor

@alshabib Any chance you could update this PR so it might make it into spec version 3.5?

@alshabib
Copy link
Author

Sure. Just pushed an update.

@dnephin
Copy link
Contributor

dnephin commented Nov 10, 2017

This needs to be moved to version 3.5 schema now, otherwise LGTM

@Vadus
Copy link

Vadus commented Dec 29, 2017 •
edited
Loading

is this in 3.5 already ?

and does the rollback_config also work on <service> -> deploy: -> update_config: -> failure_action: rollback ?

@vdemeester
Copy link
Collaborator

@thaJeztah rebased, fixed conflicts and update to be on composefile 3.7 👼

@thaJeztah thaJeztah changed the title Support for rollback config in compose 3.4 Support for rollback config in compose 3.7 May 29, 2018
@vdemeester vdemeester force-pushed the order branch 3 times, most recently from cfe0a96 to 6d966fc Compare May 29, 2018 09:23
thaJeztah
thaJeztah requested changes May 29, 2018
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw one thing, LGTM otherwise

@vdemeester
Add composefile schema 3.7
df6e38b 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
@vdemeester
Support for rollback config in compose 3.7
4e6e5d5 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
@vdemeester vdemeester mentioned this pull request May 29, 2018
Merged
thaJeztah
thaJeztah approved these changes May 29, 2018
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

we need a procedure to "stage" upcoming compose file changes (ie the 3.7 schema should be considered -dev until it's released)

@thaJeztah thaJeztah merged commit 5bc09eb into docker:master May 29, 2018
@GordonTheTurtle GordonTheTurtle added this to the 18.06.0 milestone May 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@dnephin dnephin dnephin approved these changes

@vdemeester vdemeester vdemeester approved these changes

Assignees
No one assigned
Labels
area/stack impact/changelog impact/compose-file status/2-code-review
Projects
None yet
Milestone
18.06.0
Development

Successfully merging this pull request may close these issues.
8 participants
@alshabib @codecov-io @vdemeester @sirlatrom @dnephin @Vadus @thaJeztah @GordonTheTurtle